Revert "YOLO"

This reverts commit 430f569db3ac2ae0a625c917d95459d634575f6d.

Change-Id: I99c4245625629940d83fe535fbdb79fe1b9b4887
3 files changed