Reverted 411c69b420acdc1e103a76a1a52e2c488aee5718

Needs to be thought out a little more.