Revert 1092c6b..8117fd4

This rolls back to commit 1092c6b3162b1904ac9ce81c347b001ac898931e.