Revert 08012c1..cd81b8e

This rolls back to commit 08012c1c1ffb15edf28020b711a6f1f77d8bd4ee.