Remove workaround for compiler bug.