Revert f84c127..d4a10e6

This rolls back to commit f84c1277757d2e90419d8723028be5d14f6a4c5c.