Revert "Using build tags in order to test timeout related code changes to goon"

This reverts commit 3497e755ba83781c1a264c21ec6dc599a0abab88.