Revert 3c64fa0..c6f939e

This rolls back to commit 3c64fa052a7a0271601832c0a0fa3147804f86fb.
Revert 5f8cc7b..a6ab959

This rolls back to commit 5f8cc7b29a33ed213d370630c0edd1736dcd6d2d.