Revert e4010c7..fbb0d93

This rolls back to commit e4010c7db12d1f6f82067b6e73e9e0813f0e4359.