Issue #1562700 by jhedstrom, pandaeskimo, helmo, bobojo, timaholt | bastnic: Added Getting back expiration feature into D7 version.