Issue #2324945 by andypost: Fixed clean-up @todo after 2155635.