Merge "Remove overly restrictive check for memory."