This reverts commit 06c2fffd. Reason for revert: Java 8 doesn't support this magic. Change-Id: Iaa41f4e4d0072b9a97cff9cd3788403d4ab79d13