Revert "Small revert from opensource update"

This reverts commit 9e96938bac08b3c416447466b6ab09c28ce451f8.