Revert "Locker fixes"

This reverts commit 4de1b1262b2f4140c8da8bcdbbccb069a6bfcd65.
Merge remote-tracking branch 'upstream/master' into next