Revert "..."

This reverts commit 3dfbc5854779e9d2bc3df739dbd37df21a38a87b, reversing
changes made to 66a2ad8937a5b503c4111eb992924f2c73488c1b.