862b46e3e0
Makes it simpler and shorter. Still results in the same code after applying both patches in question. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>