Revert "Merged from Master"

This reverts commit 3a48591986346608e0483e3849fd885dd91958e6, reversing
changes made to 36724ed6ca017dfaa7d1cea7e31e3654b0e87eee.