Revert "Partially revert Poondog's changes, they made our phones laggy :)"

This reverts commit d0bbf8173ee3c2bffb73e0679834b9dc0820c8da.