Merge "Revert "Remove incorrect return value read""