Revert 774e1f1..d893245

This rolls back to commit 774e1f11095808407e29b7cbe5f89668e0b6b3b4.