Revert "Merge branch 'Bandit'"

This reverts commit 7e8a44a2b24851153119164ed7d04447a50f8a15, reversing
changes made to 7f2b7cf3c1c7288acad4854285baf20faf508c6a.