Revert " Video + Year"

This reverts commit dc56468b72c8c1a1ed7dcc74c99f7392a6334d52.
Revert "Revert " Video + Year""

This reverts commit 80c12ef81ef215741afe5b73182092e9cfa90d59.