cwm, dang it

Change-Id: I887776b88bb7378f6e63def28e0860fb4e9e1024