[BISERVER-10633] -- Reverted changes made.