Revert "Clean up on definition.xml and new Int markers"

This reverts commit 1e60cdec7336fab3de0b013f41df9073701fc9c7.