Revert "Latest and greatest"

This reverts commit 1519f0e40c3b51d453292cbbcb5ec19f165018b3.