Partially revert c7a12f7, 5.19.6 has broken constant support