Revert "Pin upstream to before config changes"

Dr. Jorrit Fahlkerequested to merge
rv-follow-upstream-config-changes into master

This reverts commits 2354dfb0 and abeeecd2 from !13 (merged) and follows upstream master again.

Addresses: #3 (closed)

Edited by Dr. Jorrit Fahlke

Merge request reports