Should we retain the `return_value + 128` behaviour?