Revert a661c58..81f56e1

This rolls back to commit a661c5864dc76c5377e11c92639ff43b18ee2c74.