Addressed codereview comments: reinstated support for API levels 3-5