Fix for crbug.com/94369 makes things even more ugly