[BISERVER-10816] Revert of a previous commit.