Revert 9f9ef90..32e179c

This rolls back to commit 9f9ef9094c023270503c5f183f50abef088ce317.