Reverting some changes
Not needed, already present in common repo