Merge commit 'f8d3aebe4c19283eb34fb89e5932b3399d3bd753' into eclair-plus-aosp * commit 'f8d3aebe4c19283eb34fb89e5932b3399d3bd753': Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29