Reverse patch per issue #89 (davshao)