Restore no end date functionality on frontend for 1.7