Issue 3418 revert