Revert d382e22..8141816

This rolls back to commit d382e229120522eb8b2ac21e3bc7fde4d0521731.