This hack seems to only have been necessary because of the constructor bug noted in 33125cff. Once again, it's hard to prove NFC, but that's the hope...