Bring back ext2 code from branch