Removed r221896, it seems to break build in various ways.