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

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