Revert "update from lollipop"

This reverts commit 17b2682f743a3b1487551ce2d2aef135cefe1e59.