If it really wasn't a bug, we couldn't backport it.  However, we generally treat RFC non-compliance issues as bugs unless fixing them is disruptive (and this one isn't because I took care to maintain backward compatibility in the original patch), so it is OK to fix it.

Since this is a backport and fairly straightforward, Berker can just commit it once he's up and running with his push privileges.