Fix the previous patch to make ARM build work