Revert "pull merge conflict fix"

This reverts commit 530812b26474433ba7ade551fded92531230149c, reversing
changes made to ccc57b9e9b2bb7fbf4fdf6f3b4e81e4856fbc194.