Revert 9cfc277..e1983ce

This rolls back to commit 9cfc27764eda536ed6d2171dd13e5be0f390ec0c.