Reverted changes to datadefs