MP1-4543: Re-add 'return' based on review comment from Guzzi