Revert "Change from Adam McNicol -Fix Layout Flashing"

This reverts commit dd4b19c1ce518cca1e313160333c3e87ecd42095.