Combined with b522c472 this fixes #2256

Without these two commits in place upgrades to 0.5.3 panics.