These should have been part of 15767 too.