Revert 22d7f6a..b7e7173

This rolls back to commit 22d7f6a9c756d39402b51c8d3bf11b2de1e9867d.