Undo strict id type int

Undo the recent update that changed the id to type int.

Note: We'll need to come back to this.