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