Issue #77: reverted a complication that is no longer necessary