[cntrl] put back code that was removed