53fe155b3f
Reverts commit 1469ebf8382107e0344173f362b690d19e24029d (original commit) Reverts commit a392a39f75af586e3d3cd046a8361939277e067f (build fix for above commit) The commit broke tests in out-of-tree projects, indicating that some logical error was made in the previous change but not covered by current tests.