This may not be necessary after ANG-178 is fixed. I'll update this PR accordingly after that fix is made.