* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482': Revert "Fix issue with using locally defined attrs in a shared lib"