Merge pull request #3372 from shenki/build-fix

Revert unwanted buildroot change