HRCPP-101 Always retrieve the value from a remove operation when FORCE_RETURN_VALUE is set