Revert 1e7da17..7d3b5b9

This rolls back to commit 1e7da171b3038e6fbe98d3e7b594377d3cda7b5a.
Revert 62e3e2b..7142083

This rolls back to commit 62e3e2b6848445f80ba1ff22bd82c57c63fa72e5.