Revert "Manully merge from master c3587a23bed095f674b6268ac2fa0720dcd1bda6"

This reverts commit ffe8ba7d6ee2224f9aed79cc84bff0de9af20c11.