Remove workaround that no longer appears to be necessary.
Remove workaround that no longer appears to be necessary.

lshift/diffa,aprescott/diffa,0x6e6562/diffa,lshift/diffa,aprescott/diffa,aprescott/diffa,0x6e6562/diffa,aprescott/diffa,0x6e6562/diffa,0x6e6562/diffa,lshift/diffa,lshift/diffa,lshift/diffa