Well that didn't work.

This reverts commit 008ec1735ff22fba55951b6606c215a02e091ed5.
This reverts commit e8281044257c6982e28f9011da5f9fc3a4276eba.
This reverts commit 2d515aa23e0d72df3dab1cabf414df9aba94e8e2.
This reverts commit 607127e579a458d41f0f05c1b1cbd13e0c9037b8.
Shotgun