Revert e0f52bf..56b459e

This rolls back to commit e0f52bf11e3c91c877e53563866b1842fe49423d.