Revert 2237acc..6d57630

This rolls back to commit 2237acc43b40701c009244d790e5e4a034bec959.