Revert pull #1