Indeed it should be, done in 21515f6