Revert "Maybe I can shove it all here..."

This reverts commit 9be00d201f70b864b3bd670930c4ed503054de80.