I don't see how this ever worked - not the best solution but it works now. (cherry picked from commit 1ba498b2)