WP-2447: Bu mistake some changes of another issue have been added, now removed