get rid of workaround for the layout bugs on 2.3 version OS