Reverted some fixes from gh-pages