Refs #2405: Revert of previous related commit

132470a6972cb1fbf8c075580cd21386ccab7b77