Revert "Maybe this works better?"

This reverts commit c3f88327e8b195c39d1a694ae392c1718b50d862.