Revert "After pull upstream"

This reverts commit 3fb3b32f5d27a759cc77c09d06ddfad792ad1913.