[PLAT-3186] Back out changes that might be causing issues