[mogno] remove workaround.