Revert "Update goof fix"

This reverts commit 9520752d21be50dcee8a2c7ce52df9a33be9c889.