+ revert changes for issue 1873