Please see #1168 (second commit) for this...