Revert 02cd394..24df3fa

This rolls back to commit 02cd39403c0488682e768cad96644f09446d6357.