Switch to classic, as to not break CafeBabe, avoid empty extra block