BUGFIX: Fixed unanticipated consequences of createtimestamp fix.