This reverts commit 84e9e197, because it breaks bionic builds. The patch is desirable so hopefully we can come up with a solution or alternate patch soon.
