PLAT-3928 Back out change.