Revert "Merge with fixed branch"

This reverts commit 796d5c7c8ece780a8c03c8835243727da84d80de, reversing
changes made to c0ee4d789202493c74a4c77209b6877322ee43b5.