Revert 7419870..ac92602

This rolls back to commit 7419870388d5cfacf8d9df9cc32e710580ec53d9.
Merge branch 'master' into gh-pages