@ohadlevy, requested by @domcleal to keep environment to avoid any breaking changes to v1