do not add an 'abstract' modifier to 'static' methods
(cherry picked from commit d07565c)
Test fixed (test for non-backported functionality dropped)