Revert "possible conflict"

This reverts commit 35c3ed09b81a8f1db15f98d958e98d8da0e700aa, reversing
changes made to 37ea423fda206f2522199dfadd9ea60e9b0ec5a4.