Trial build to see if removing @reflects_state (to fix github issue #15549) causes anything else to regress