Revert "d"

This reverts commit 305501fc96ff14ad0ec59201f86dd0958fe7a760.
Revert "g"

This reverts commit 60098913d71dcf411a3e68f85886041ecb9d0772.