Remove code to disable lock and blanking
Merge pull request #170 from dminor/bug-1038420-fix

Remove code to disable lock and blanking