revert boxes to original commented-in/out state, add TODO for removing vagrant patch