Merge "Revert "Change to use setupdesign library""