Revert 331d69a..1fdef8a

This rolls back to commit 331d69a91e4af8867d80a69e859c17737df71996.