Replace d280912f31 with a cleaner approach. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
d280912f31