The PR reverts #21246. Author: Marek Novotny <mn.mikke@gmail.com> Closes #21786 from mn-mikke/SPARK-23901.