Revert "Implement scrim method" am: 35885b3ca4
am: c79196eb4a

Change-Id: I4f5671d48d2d9f42cf3a9f872fab923f3c2c4a57