Version 9
Revert c54790f..73c56a5

This rolls back to commit c54790f30b92a9eaa0539d2097e637e33085b2ab.
Version 10