Revert to previous beaver version (22)