Revert "fxxk merge"

This reverts commit 772086fd90a5876521aa38a9f36668bed26e291e, reversing
changes made to b01bba956bcafbfd8e053f2864462f3dee6aaefd.