Revert c037ded..52681ad

This rolls back to commit c037ded660cb001dd886a908b9e6fb5d6ed76b20.