Revert "fetch upstream and add localrcs"

This reverts commit c8847e8049dd33321f47074c0fb08c4294fc53d4, reversing
changes made to 71cd7c791a1754919b509daa824742ad90aaf4e0.