Revert "Genesis now compiles correctly"

This reverts commit 581ed1165896c6ebe156407b7c26aaf98eecc9f3.
Revert "Revert "Genesis now compiles correctly""

This reverts commit 77561b4322a54a35b9b5019c8e07538a241212f6.