Revert c2edff0..6220193

This rolls back to commit c2edff00f5cc3206f20eba3db44dc15c34d801b6.