Back out 81dd398600c4 (bug 850336) for linux bc2 leaks-until-shutdown