Revert "merge upstream to master"

This reverts commit b8ad2bf4ddbc2cd650107192a71c039e153b3465, reversing
changes made to 8a51087e74b8cad6b21f5796bb37ca106b3df861.
runcoms/zpreztorc