Revert 99d16a4..6e4abc0

This rolls back to commit 99d16a4f0684bd46e430420c2a29514bfb15fa01.
Revert 43a65f7..779b234

This rolls back to commit 43a65f74bff26fd22dbea40f8fa471cfe12d03f1.