Removed unneeded client side dependency while cleaning up after UL-20.