Removed Android < 4.0 workarounds