Revert to commit 33343d7c2fef3b9e63719c623d5f76cb43453087: avoid rpm bug [RH:447156]. Refs #2350