Summary: backout fix 8050808 which caused this regression and as requested.
Reviewed-by: hseigel