Re-apply 103156 and 103157. 103156 didn't break anything. 10315 exposed a coalescer...