Revert 5462dfe..9461612

This rolls back to commit 5462dfebbd60b9789baa5ea523f672ebc4886f62.
Revert a7683bd..d6142b8

This rolls back to commit a7683bd6ee95736645c0a504090a3ce78ccd343b.