Fix stupid mistake in prior commit.
Merge branch 'support-http-handler-customization' into basis-internal-release