issue #1724: Reverted vs solution.