Revert 592b388..e387622

This rolls back to commit 592b388afcce2e6504a80abdc1bbf2ee4691ab30.
Revert 6181317..fe98e4a

This rolls back to commit 6181317b13574c599d99c2bab9bf7a4f9fb916e8.
Revert