Remove  PR #5093 code