reverting fix that was mistakenly released to 1_5_maintenance branch, that was intended (only) for 1_5_5_patches branch.