Jank @olasd's hack, clean up core.