Remove workaround that is no longer needed