GROOVY-6990: Do not add timestamp fields if possible
Merge pull request #499 from melix/timestamp-removal

GROOVY-6990: Do not add timestamp fields if possible