can do this job better and yet be more readable and straightforward. Verified by: comparing build logs Feature safe: yes
