Improved crbug.com/375297 workaround