Revert b7384c3..5386ca8

This rolls back to commit b7384c30438049efd96e141dfe069f5b5e4f5bd7.
Revert d0dd1f6..dff0337

This rolls back to commit d0dd1f61b33d64e29d8bc1372a94ef6a2fee76a9.
Revert bb4cc8d..3a89d6f

This rolls back to commit bb4cc8d3b2e14b3af5df699876dd4ff3acd00b7f.