- Revert Nibble patch, causing issues still