176413d312
This reverts commit 5805ffebec.
There is no good way to fix this on the Mirall side without risk.
Delay until after 1.7.0