am b1dd9df4: Merge "don\'t re-apply the class-adding transforms" into jb-ub-mail-ur9

* commit 'b1dd9df438d8c23ebbf632bf4cc5cccb73378cc4':
  don't re-apply the class-adding transforms