Revert 9f1e376..5e52fe7

This rolls back to commit 9f1e376ba942404a307618d74e28432b18978d7d.