Revert "fix merge issues"

This reverts commit 2476794fe0e6765ff280b1aa62ad0ddf2fbc6e55, reversing
changes made to acbf913dcf14f75f9d41f7531ffd458c158866cd.