#6599 by thmeyhoff
_