Revert "Cillian did some stuff"

This reverts commit b2d3b2bd6175f34098a8cf1738cdef7dfa0e0d0c.