a slightly smaller sledgehammer, refs #926
merged a slightly smaller sledgehammer from [3682/branches/0.11], refs #926