Revert to old style to stop the crash, for now