Revert 160e065..8430108

This rolls back to commit 160e065230d4eee5de84727b27e32fdac799304e.