Revert 0f87b22..7019f50

This rolls back to commit 0f87b2295e4be29128a933ba65f7117a093d5f52.
Revert 7019f50..a00a901

This rolls back to commit 7019f50d6b1816ab9698828b949c8b0b73afc679.