Revert "Merge pull request #1 from mwfractal/Lollipop"

This reverts commit b6f7d7e3c5bd3e4a22903a8c89e13c3d5e11f359, reversing
changes made to f8f039699f39c55e398084476408c33f2f32e2d6.
Revert "Revert "Merge pull request #1 from mwfractal/Lollipop""

This reverts commit 26109595061d81bc3d53bb22ff79cdd368ad4044.
Revert "Revert "Revert "Merge pull request #1 from mwfractal/Lollipop"""

This reverts commit c699bbb9a15636586b9117bd0d3987a57e76b3b2.