Revert "Combination of work"
Revert merge since it doesn't appear to work

This reverts commit f185bddf8406a066bf855b53d0a3c493d9b10c0a.