I think this would have revealed #1399 earlier. This can't be done till the next version bump because it's breaking.
