Fixed issue #534: Revert back b25070d