Revert "WE HAVE MERGE 1"

This reverts commit 5a164e910519f11019127d66141a4e595665153d, reversing
changes made to bed3b3ee429dc84768cd4f23bd9f2522ed8d8445.