Revert 126 alpha hack, failes on Travis, must be somehting weird on my local machine