Revert "merge conflict"

This reverts commit 52ec9b6b8e9fe24fef3db12fa51f668d625c0683, reversing
changes made to b74e0aa79a3bff56463518d2b1cb58f1144f8dae.