Revert 9ddb2f9..d86d865

This rolls back to commit 9ddb2f981624c26a704add44862e24b09c589c24.
Revert 5f6ed50..c744fd5

This rolls back to commit 5f6ed5052336cd09b4e1bb99bd6fdb32b6f129c8.