repair botched refactor start during BOTPP integration RT# 8600