Revert e553442..72325bf

This rolls back to commit e55344222ec2cccfb6527c4064bcee28fb216966.
Trying something new.