Ensure we return gulp tasks

- Restore stop hack