Revert "Take out drop-privs patch"

This reverts commit 3cd5688b24c1b8116c1a2731f765f5f059c10259.