Revert 1c01f37..5599041

This rolls back to commit 1c01f37307582f5d31b255bdf69f29f62724c06e.