WL-3119 WL-3138 Backout non-build/working patches.
WL-3119