Revert "bullock"

This reverts commit 337675fcb93f93629e7bc6d4ad4fa661291839e9.