Back out b6f9dbc91dc4 (bug 947038) for Cipc crashes