Remove the 'final' modifiers added in the previous commit