Revert "Merge changes"

This reverts commit 69efb1a72b644d5ee63e360f347f633e469da8f9, reversing
changes made to c6a1d4dc1fac7752aecb337761c1cfc386ddd2ec.