Revert "regex for year tripped up on encode 1080"

This reverts commit 26b177975b60042f1c94233bcaa42ab8e8dd0dfc.