CM is sometimes dumb!

This reverts commit 31a34931c274bd2fbabd6c2465a590b72cff918a.
We forgot this!

Change-Id: If3a6f50789d10e807b26da1cbe7528e9ea8d5fbe
Revert "We forgot this!"

This reverts commit 79d99b4bb5e8323ffc78af80954122d8a13c08e1.
Enhance Breath

Change-Id: Ieb3b34288442b82c62cae26c2964d80dd4757dba
Refactor

Change-Id: Idc74a1c608008fd2cda81b0bc855cf4d5a046c90