Revert c8d8ae2..0c42efe

This rolls back to commit c8d8ae2360d37e734b271f6fac0b1812248a9c1a.