Reverting commit r185999 due to buildboot failure.