Revert "merge"

This reverts commit a071f93cda6dfc96695cc63eb2144a328e0d9502, reversing
changes made to 7c1c71b910a7a7be8904c0a5cc7ec29a7f42e4f1.