Committed change that breaked overlay in 2.4.x.