#3669: rolled back case&control labels