Reverting Merge crap
Revert 0cfcc93..eea121f

This rolls back to commit 0cfcc93e80c93d816518c1ff58dc2b7d263f23af.