Remove workaround for fixed bug