Partially revert 901e553337ba13b445cbd73e14b26b453c9ee232

Do not change these classes without testing on all browsers