Revert fix #167