Revert ea8b854..4726912

This rolls back to commit ea8b854375385fea569677288674d1c9f55328f9.
Revert d4b8c52..d6fa73c

This rolls back to commit d4b8c52540c5e37f65e71061356aaeff11adbbb7.