Bugfix was not properly backported to 3.0.  Closes #1297