revert pull 1325

revert pull #1325