[BISERVER-12154] - Reverting changes put in for this case
Merge pull request #2074 from dkincade/master

[BISERVER-12154] - Reverting changes put in for this case