Fixed #123456789, breaks #5551212. References #3241