This reverts commit rABCbc98be2f2c59919cdbb957ba06858b5b4088edcb.
Issue preventing original implementation from working resolved in D15408
This diff is D15379 rebased onto D15408, no other changes (aside from version difference to account for diffs landing in the interim)