Removes duplication introduced in #328