Fixed issue #533: Revert back b25070d