Remove workaround