This code was added in PR #3941, why was this reverted?