Backed out some of the changes for ENTESB-2169 since they were breaking ...

...the perfectus build