Revert 977a44c..dc33dce

This rolls back to commit 977a44ce5c60e78c63f8a60aaf14f14b14d465ee.