It turns out that the ordinal number adjustment that was added for
fdo#34548 is no longer necessary.

Change-Id: I2c491a008500b6a269b6f05a2a72f5aa70edecb2