Merge #286

286: Drop workaround for 16.04 era compilers r=Saviq a=AlanGriffiths



Co-authored-by: Alan Griffiths <alan@octopull.co.uk>