Have back-compat shim actually return the value