Revert 6a0a9c8..2632ec7

This rolls back to commit 6a0a9c8ea84b44eda9cdb7ab880aac1596d4a595.