Before flashlight redesign to fix Chrome issue