Revert a365f75..3ede787

This rolls back to commit a365f75ebb5f4ea576ab45321b90443c84e306b0.