Merge "Comment out the isAvailable optimization." into honeycomb