Revert 7640835..084008f

This rolls back to commit 7640835c9b2accd25b0266e58d390009a4931d18.