Revert "Clarifying semantics."

This reverts commit 45214c9e5b34def6ea270229cfc840d776faeea3.
Resolving conflicts.