Revert 47014 until it is more robust
4 files changed