[CB-3430] [CB-1413] Remove Old (2.3.3) HTTP Workaround