Merge "Revert "Keep a light version of the SBN around"" into qt-dev