CORE-6143: Applied Kludge until 6143 is complete