Revert to using 'id' for idAttribute