Correct erroneous conflict resolution from earlier merger - see Issue #205. Also remove OnTVFromRender code for ManagerManager.