Revert "Remove these for now"

This reverts commit d2b13c5ece78e3e6c9bd19e3932097252d8babab.

Change-Id: I64980323b2dfc89c1b88021205480868432eb03a