Revert "Attempt to capture more, better" as it caused a regression

This reverts commit e6e64fbc4c8d3cf126646f6d12def37d0744a160.