Undo

Pretty much an immediate "this is dumb" fix on the function definitions.