Revert undesired effect of fixing bug #2927