Revert 7e4d8a7..84a75eb

This rolls back to commit 7e4d8a77004f0c17124abf53de261b101066108f.