Reverts the change introduced in f631efeca9 , which changed the way drawables were handled, which introduced issues on pre Lollipop.
f631efeca9