falcon : Revert some stuff