Another try at Eclipse 4.4 compat