Add labels back; they are used for BetterPlanner.

This reverts commit d2ff75a826aa3dd0e6f0d2d0964bf4b3c76d159f.