Revert part of 17bccaed428ac1f6ec9f8e667175ad81e90508ff
Revert part of 17bccaed428ac1f6ec9f8e667175ad81e90508ff

Commit 17bccaed428ac1f6ec9f8e667175ad81e90508ff accidentally reverted
the fix for 73490 from 5cbc7634043707c3a0e442014910fc7f6db317e0.

xorgy/weston,Tarnyko/weston-xdg_surface_present,krezovic/weston,Gnurou/weston,mchalupa/weston,eyolfson/weston,Fantu/compositor-spice,Fantu/compositor-spice,giucam/weston,Fantu/compositor-spice,jonnylamb/weston,udoprog/weston,giucam/weston,kwm81/weston,eyolfson/weston,mchalupa/weston,kwm81/weston,Tarnyko/weston-xdg_surface_present,jonnylamb/weston,sir-murray/weston,krezovic/weston,xorgy/weston,Gnurou/weston,udoprog/weston,sir-murray/weston