refactor to get working under vagrant 1.2.x