Revert e25f3ef..29d8b78

This rolls back to commit e25f3efca64ac6e087598477919d161d0c20605a.