Remove frame hack for flickering issue