Reverting changes in Yeoman 0.9.6.x which made their way into this branch.