Re-write for proper gulp returns.