Merge "Revert "Fix supportsNonblockingRead""