[avogadro/f14/master] Undo unwanted changes by Rahul Sundaram which break builds on F12. (While I am at it, also readd the

[Kevin Kofler]

Summary of changes:

  8868e31... Undo unwanted changes by Rahul Sundaram which break builds  (*)

(*) This commit already existed in another branch; no separate mail sent