The core developers might come to a different consensus to address this problem, but until then I'm incorporating this change to make sure future releases can be produced.
