Revert "golden: workaround for build recovery from ics code"

This reverts commit 01495857cd71167fac2a5ac3d7e821050d69c026.