I don't know why I didn't clean these up when I learned about this trick. Test: treehugger Change-Id: Iec74cab28c782a61ef3e48210f3a48043e981212