Provisional repro of #352