The workaround is an *actual* fix. Except that we now understand it!