Okay, this is REALLY the last commit of the night.

PS: Remind myself to move this project to Gerrit CR.