Quick fix for banned methods, revert after hackdays