Changed semantics based on PR comments.