Revert 3d188d1..3b275b1

This rolls back to commit 3d188d19f0cc1d5f6ddb409da948143e11aca260.
Revert 004dde5..243b4b9

This rolls back to commit 004dde5342d1d95eccbaef16b811a428c88dfdf7.
Revert 243b4b9..f6aa1f6

This rolls back to commit 243b4b9f04884bb2652060be0df9e800cfe1167b.
trying to fix stuff