15c39cb258
This reverts commit 9bc3ab23cba44ee9cdad2e6a24c9783a993183c5. This is not the way we're going to organize common code.