Remove failed workaround for SCM-740