Revert "Sync with Jekyll branch"

This reverts commit 837fd34af77c9a73a7e8d6849591bcdd5f0bd908.