Revert "bionic: Unbreak scorpion!"

-Moved to patches

This reverts commit 08a52b8ccf9290c6a2eb0d6e3d9ea699ee0fdace.