Merge "Remove workarounds in ACM installation"