Why is it safe to remove this code now? Can you add a quick comment about it to the pull requests's description, so we know not to use this change as a scapegoat for future bugs?