Revert 0e4a2da..be78201

This rolls back to commit 0e4a2daa60f099898ed8d96a2a249967cf9fe918.
Revert d44d994..4f923b3

This rolls back to commit d44d9946e29765a883d48158e1f932dcde4613ac.