#3916 is an attempt to get this right.