#19713 Rip out server side code for removed fields