Revert 4f540ef..4eef76d

This rolls back to commit 4f540ef9377a61178a407d7ce85a6aaf0e0c72f2.