Revert changes to leave only inline cellTemplate changes in