Readd change accidentally clobbered during merge
Readd change accidentally clobbered during merge

alexdiliberto/chancejs,chancejs/chancejs,AshCoolman/chancejs,lonely8rain/chancejs,edarchis/chancejs,mklaber/chancejs,franciscop/chancejs,victorquinn/chancejs,theusualcoder/chancejs,mcanthony/chancejs