Revert "broken lollipop"

This reverts commit b7e8c1d06a33266add29dc311bb693f67e47f26c.