Revert e995464..30dbf72

This rolls back to commit e995464434a4ad1498072e75fcdd3209a02eb02b.
Revert 30dbf72..e2c2856

This rolls back to commit 30dbf725746520f6205945e7c8ff3328ea4c4985.