Extend rather than rewrite to see if our problem lies in the DST or not.