Revert "Enforce calling identity before clearing."

This reverts commit 8be3a92eb0b4105a9ed748be5a937ce79145f565.

Change-Id: I10401d57239b868f8e3514f81a0e20486838e29c
(cherry picked from commit b440ceb00fd46c9233723066c680a538067fbf82)
1 file changed