Reverted to 2.4 now that tankers etc. are fixed