Revert 584d45e..74f878f

This rolls back to commit 584d45e542dcfe4972778efc3021dee016f628b4.