Revert 1d4a23a..2005d5a

This rolls back to commit 1d4a23acfbc20e6af0ce039b5348332c4dce901d.