Revert "Resolving pull problems"

This reverts commit 04343915b4a81cc9b78b1c2ab24aed45fae4644e, reversing
changes made to 5a86cfaa363df1222ae49111b201be88fe13e858.