Restore JavaSE-6 compliance

Signed-off-by: Kirill Zotkin <kirillzotkin@gmail.com>