Resolving conflicts for revert
Revert "Prepare for merge to gh-pages"

This reverts commit a0ccc39a6c9a9dd34f6640ffdb553614387e746d, reversing
changes made to f6d1cb7793db4a2f8b88c86bb7d6a954d0d9325d.