Revert "Fix for Android L"

This reverts commit 5dec27c333451d96abeeecbc9c49eefa7ebda51c.