Removes duplication introduced in #338