Another attempt to pick up the maxHeight on chrome
Merge remote-tracking branch 'origin/jdrake-working'