Revert "native: fix mis-merge"

real problem was cleanupWithoutDisable vs cleanupWithoutDisableLocked

This reverts commit 5a4a8bafa7a21255a30b13d08436aef0d6cbcba7.

Change-Id: I8fb30840ca09a4a5bbce0e62c37c4677f489f42c