Unfuck the master->crypto branches