#53594 not needed for <6.2

#53594 was submitted for 6.0 to 6.2, but is only needed for 6.2
Merge pull request #48 from liayn/patch-1

#53594 not needed for <6.2