Revert "Going to roll this back"

This reverts commit d51d68a8b1891875c9c4327e159046d4632cd0e9.