Remove frame hack for flickering issue
Merge pull request #907 from raven02/patch-8

Remove frame hack for flickering issue