Keeping up with D8.

Signed-off-by: Jonathan Hedstrom <jhedstrom@gmail.com>