This is a cherry pick of Leste commit 2c7e4a1ac8ec1f908927793e893566aac3dcb9df, to revert mainline commit f959dcd6ddfd29235030e8026471ac1b022ad2b0, which breaks N900 modem. This is a temporary workaround until a proper fix is found.