Revert "Make permalink parsing consistent with pages"

Reverts jekyll/jekyll#2921

This was the only breaking change I accepted in current `master` since `2.4.0` release. Reverting so we can release v2.4.1.