Revert 17d07fe..f17810f

This rolls back to commit 17d07fe65dd3733fe5f5a810723b49d2dcd24159.
Revert f17810f..4daef04

This rolls back to commit f17810f2eb4bc0267a40fc4d6099e73d2bae9892.
update 9
update 10