Revert 4393533..439eb6f

This rolls back to commit 43935337e766034e67bbfe34582b32e01b349120.