Unreviewed clean-up after r219323