2.24.1.1 ======== * Revert the partial fix for bug #548600 due to regression it causes