Revert e162daf..838c34d

This rolls back to commit e162daf5671e25fd733e1fda6ce936d99d3183a1.
Revert 838c34d..a483d1e

This rolls back to commit 838c34da2ecaf41ddc430589d5a5a2aaef10d30a.