Revert r36537. This was based on a wrong assumption. With the sample at hand, the error is actually reproducible with the MESA implementation (in fact, that one just crashes instead, so the workaround did no work for it).