Continuing.
Revert 0f67c8b..963ce5d

This rolls back to commit 0f67c8b038e973e7978f9780f15a112979b15318.
Revert 083351a..c1e57e6

This rolls back to commit 083351af82912aa1535640ede0b7818a5ae12326.
Revert 963ce5d..8a83b1b

This rolls back to commit 963ce5d1f87d18b27e7d13f4ea133b38a43af035.