Applied patch; see ticket #5627.