Its not an important bugfix, but it is a consistency issue. Can we cherry pick: https://rbcommons.com/s/twitter/r/3749/diff/3 if we make another rc?