Revert "Merge remote-tracking branch 'upstream/master' into feature/abstract_resource_intermediates"

This reverts commit c851ae6582e0b1a254b1aac50022535d9addcf3e, reversing
changes made to 7b90881cbe12e6c2aa3208aa29de38fd98b1a9b7.
Stand