Fix post-merge comments in #15316 and update source. Signed-off-by: Daniel Golle <daniel@makrotopia.org>