Apply Bastian Blank's userspace namespace cleanup patch.