Revert 4a7c14d..5251e1b

This rolls back to commit 4a7c14d5aef12eefae07aa67823c98bedf16d2c7.