Revert ab9b6ed..f0e396b

This rolls back to commit ab9b6ed7f3eb399ea48e5dc2c6236d9edb0354b9.