Revert 8c53cc0..547ec7f

This rolls back to commit 8c53cc029632ca6d76b2b09ddb5b8bfae5f9f657.