It seems like @Snuffleupagus' commit fixes this, by the way.