Revert b3731b3..e05e1ef

This rolls back to commit b3731b31c540a9ffad9943acd08e6d9c2fcc94a6.