Revert 41fc436..1bd89a8

This rolls back to commit 41fc43675cfe5f12cc0f2ce161cb57694f48dc7e.