Revert "WIP - try Evan branch"

This reverts commit 5218cac453a5130537302de0faefc77bfe67ca09.
Revert "WIP - try to disable lockscreen patch"

This reverts commit 27b339863446e60e15c1d8543f9713e6a1d774c6.
WIP - blacklist