lockon4
Revert "lockon4"

This reverts commit a37a5d3f2ee1be9efdfca23935282bd3b289288d.
Merge remote-tracking branch 'origin/master'