Replaced references to unreliable System.currentTimeMillis()