Revert 71c898f..e43e9dc

This rolls back to commit 71c898fbb35cc27c41409e402a0873dad199f667.
Revert 200e3fd..9dae1c0

This rolls back to commit 200e3fd3ab7b284dd73fd171c734ddf5bb79ce69.