GATEWAY-3273: Removed 3222 changes.