This reverts commit 340d9f7687538918722b4906f74ca5bb976453fd, reversing changes made to a90bb33e9019d6f4506db2f4fb04c956161c89a2.