Amend r6323: Make work correctly for scaling other than Y=1
Authored by: fhoech 2019-12-04
Parent: [r6340]
Child: [r6342]