rolling back Nick's work so that we can get cucumberjs working