Revert 6dfa349..4900b48

This rolls back to commit 6dfa349121568ebfad98f2784824026ff35e6d04.