Merge pull request #49 from e-cuellar/4.8

Fix for BISERVER-10605
Rolling back fix for BISERVER-10605 since it was not requested for
4.8.... Note this will reintroduce the issue...