Revert 57732f0..bc21ae6

This rolls back to commit 57732f01f4956e8c285832e246df66b54f380890.