Revert "Merge"

This reverts commit aed804ca8254242b7a94f8c0ee29dec7e72437af, reversing
changes made to af84bc691a5f8c582c91478e438c0f03b802fb9f.