Revert 6a35366..90c1454

This rolls back to commit 6a35366477b8c9c547f289024defb19531f8040b.