Revert ef4ad84..1c838e8

This rolls back to commit ef4ad84dd6c8f4885401cb1361613e8925436e0b.
Revert "Revert ef4ad84..1c838e8"

This reverts commit 63324fc7d41a4afea461058c28fa1b9b05099285.