Revert all implementation back, just keep ft + fabfile changes