Rolled back undesired changes from last commit.  (See Bug #1802, updates #9 and #10.)