Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev