Fixed regression introduced by patch for bug #67072

This applies to 5.4 and 5.5 only as a legacy fix.