Remove hack not needed anymore
release 0.6.2