Revert "New idea, didn't work."

This reverts commit 61feed0e450e33ac235714be9c3ac197726de9ad.