Revert 6bc9023..e976f3d

This rolls back to commit 6bc9023c693444c0d126a5fea8917659c827fb80.
Revert 9994ac8..d7ef733

This rolls back to commit 9994ac8757abe1c06d7fdc50ea4b64820e079297.