Fix for reverted layout fixes.