ivory-backend: backout change since from bad merge.