Revert 591df95..858c9e3

This rolls back to commit 591df95406d7623f0eabfd3f31a77be1ef3b625c.
Revert 858c9e3..0f7b99c

This rolls back to commit 858c9e3606b3369fcddbc54a34b65b8f01ec0079.