Revert fefa2b9..a51f4c9

This rolls back to commit fefa2b910737a1fc33a094eb1abd622b1d216ba0.
Revert 30b83bf..43a15d2

This rolls back to commit 30b83bfc90d5c39fe4fa9c271a5501d0a5971528.