Brought back stuff lost in bad merge conflict resolution done by the legendary @yoda

1 job for issue64 in 6 minutes and 31 seconds (queued for 2 seconds)