This looks like a reversion of a bug fix...?