Import missing exception; Revert timedelta change