Rollback previous patch to compose.php because it breaks more than it