Revert 6193369..1a0a2a4

This rolls back to commit 6193369f038e06cfa9e62bdd0f6d5bd8cf4d542f.