Essentially reverting c5b6129 because it was killing Safari.