Refs #14 - Do not try to fix bug introduced in other issue.