Reverted non-askbot specific changes