Revert 748ee24..dc7d8ba

This rolls back to commit 748ee240d3b37491bd55cdc2aa03cb5c3f8c09f5.