Revert "Try this approach"

This reverts commit c393a854f32d880fd795cc0c603290fb72a34cde.
doh.