Revert 802623e..24012cb

This rolls back to commit 802623e42ba0245fefaca3eb83022bcb5e1d9e69.