Revert 88320bb..b7dce8d

This rolls back to commit 88320bb797d191d34f6b67a40af948d33b9c30fe.