Better check when related to commit e5635a76e2, and it was deemed ok to
pack it this way so we will not change it in 15.08